/*!!!!!!!! h_clib !!!!!!!!*/
CLIB INCLUDES
        macros.h                /* No Change */

/*!!!!!!!! h_devices !!!!!!!!*/
DEVICES INCLUDES
        audio.h                 /* No Change */
        bootblock.h             /* No Change */
        gameport.h              /* No Change */
        inputevent.h            /* No Change */
        keyboard.h              /* No Change */
        keymap.h                /* No Change */
        narrator.h              /* No Change */
        timer.h                 /* No Change */
        trackdisk.h             /* No Change */

/* devices/clipboard.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#define CBERR_OBSOLETEID        1
DELETED:
struct ClipStream {
    ULONG   cs_Length;                  /* total length of the clip stream */
    UWORD   cs_Unit;                    /* clip unit (set by read) */
    /* struct ClipItem data immediately follows */
};
struct ClipItem {
    ULONG   ci_Length;                  /* total length of the clip item */
    UWORD   ci_NameLength;              /* clip name length, including null */
    /* the null terminated name immediately follows */
    /* the specific type struct immediately follows */
};
/*** "ANSI" clip type ***/
struct ClipANSI {
    ULONG   ca_Length;                  /* number of ANSI bytes */
/*      this consists of a byte stream of ANSI 3.64 bytes whose length is
/*      ca_Length.  Private escape sequences are as for the console and
/*      printer devices, with the following addition to select fonts:
/*      <DCS> x<font-name><ST>
/*      where <DCS> is the byte $90 or the string <ESC>P,
/*      " x" are the two characters space and lower case x,
/*      <font-name> is the name of the amiga font in lower case sans the
/*          ".font" suffix, and
/*      <ST> is the byte $9C or the string <ESC>|
/*
/**/
};
/*** "bitmap" clip type ***/
#define BGF_COLORMAP    0x01    /* set if the color map is valid */
struct ClipBitMap {
    WORD    cbm_Modes;                  /* graphics viewport modes */
    UWORD   cbm_XSize;                  /* width in pixels */
    UWORD   cbm_Rows;                   /* height */
    UBYTE   cbm_Depth;                  /* depth */
    UBYTE   cbm_CMapWords;              /* number of elements in color map */
    UWORD   cbm_XOffset;                /* Offset of the */
    UWORD   cbm_YOffset;                /*   clip in the */
    UBYTE   cbm_ZOffset;                /*   original source, */
    UBYTE   cbm_CMapOffset;             /*   including the color map offset */
    ULONG   cbm_BitDataLength;          /* # of bitmap bytes after color map */
    /* the color map words follow */    /* color map */
    /* there are cbm_CMapSize words of color map */
    /* the bit data bytes follow */     /* bit plane data */
    /* bit data encoding */
    /*
    /* to interpret the byte data, read it as a byte stream with header
    /* bytes of two types, depending on bit 7 of the byte.
    /* +-7+6-5-4-3-2-1-0+
    /* | 0|   <count>   | literal stream: take the next count bytes as literal
    /* +--+-------------+       bytes to represent the bit plane values of the
    /*                          clip.  Each row starts with the MSB of a new
    /* byte (no shift is implied by the Offset fields).  The next row is
    /* implicit when enough data has been provided to fill a row, the next
    /* plane is implicit when enougn data has been provided to fill a plane.
    /* The <count> can cause the stream to wrap both rows and planes.
    /* A <count> of zero is special and causes the remaining stream (enough
    /* to describe the clip) to be interpreted entirely as literal bytes.
    /*
    /*     or
    /* +-7+6-5-4-3-2-1-0+
    /* | 1|  <repeat>   |  repeat stream: take the next byte and repeat it
    /* +--+-------------+       <repeat> times, where zero indicates only one
    /*                          occurance of the byte.  The repeated bytes are
    /* otherwise identical to a literal stream consisting of <repeat>+1 of the
    /* bytes.
    /*
    /**/
};

/* devices/console.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
/****** CTC parameters ******/
#define CTC_HSETTAB     0
#define CTC_HCLRTAB     2
#define CTC_HCLRTABSALL 5
/****** TBC parameters ******/
#define TBC_HCLRTAB     0
#define TBC_HCLRTABSALL 3
OLD:
#define M_LNM           20
CHANGED TO:
#define M_LNM           20      /* linefeed newline mode */
#define M_ASM           ">1"    /* auto scroll mode */
#define M_AWM           "?7"    /* auto wrap mode */

/* devices/input.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#define IND_SETMPORT            (CMD_NONSTD+5)
#define IND_SETMTYPE            (CMD_NONSTD+6)
#define IND_SETMTRIG            (CMD_NONSTD+7)

/* devices/parallel.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
/******************************************************************/
/* CAUTION !!  IF YOU ACCESS the parallel.device, you MUST (!!!!) use
   an IOExtPar-sized structure or you may overlay innocent memory !! */
/******************************************************************/
OLD:
        ULONG   io_PWBufLen;     /* length of parallel port's write buffer */
CHANGED TO:
        ULONG   io_PExtFlags;    /* (not used) flag extension area */
ADDED:
#define PARB_RAD_BOOGIE 3          /*    "     (not yet implemented) */
#define PARF_RAD_BOOGIE (1<<3)     /*    "     (not yet implemented) */

/* devices/printer.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#define SPECIAL_MILCOLS         0x001   /* DestCols specified in 1/1000" */
#define SPECIAL_MILROWS         0x002   /* DestRows specified in 1/1000" */
#define SPECIAL_FULLCOLS        0x004   /* make DestCols maximum possible */
#define SPECIAL_FULLROWS        0x008   /* make DestRows maximum possible */
#define SPECIAL_FRACCOLS        0x010   /* DestCols is fraction of FULLCOLS */
#define SPECIAL_FRACROWS        0x020   /* DestRows is fraction of FULLROWS */
#define SPECIAL_ASPECT          0x080   /* ensure correct aspect ratio */
#define SPECIAL_DENSITYMASK     0xf00   /* masks out density bits */
#define SPECIAL_DENSITY1        0x100   /* lowest res */
#define SPECIAL_DENSITY2        0x200   /* next res */
#define SPECIAL_DENSITY3        0x300   /* next res */
#define SPECIAL_DENSITY4        0x400   /* highest res */
#define PDERR_CANCEL            1       /* user canceled a printer timeout */
#define PDERR_NOTGRAPHICS       2       /* printer cannot output graphics */
#define PDERR_INVERTHAM         3       /* cannot invert hold & modify print */
#define PDERR_BADDIMENSION      4       /* print dimensions illegal */
#define PDERR_DIMENSIONOVFLOW   5       /* print dimensions too large */
#define PDERR_INTERNALMEMORY    6       /* no memory for internal variables */
#define PDERR_BUFFERMEMORY      7       /* no memory for print buffer */

/* devices/serial.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
/******************************************************************/
/* CAUTION !!  IF YOU ACCESS the serial.device, you MUST (!!!!) use an
   IOExtSer-sized structure or you may overlay innocent memory !! */
/******************************************************************/
 
OLD:
   ULONG   io_WBufLen;    /* length in bytes of serial port's write buffer */
CHANGED TO:
   ULONG   io_ExtFlags;   /* (not used) flag extension area */
OLD:
*               13-16           reserved
CHANGED TO:
*               13-15    (not)  reserved
ADDED:
#define SERB_7WIRE      2       /*    "     RS232 7-wire protocol */
#define SERF_7WIRE      (1<<2)  /*    "     RS232 7-wire protocol */
ADDED:
#define SerErr_NoDSR          13
#define SerErr_NoCTS          14
#define SerErr_DetectedBreak  15

/*!!!!!!!! h_exec !!!!!!!!*/
EXEC INCLUDES
        exec/devices.h          /* No Change */
        exec/errors.h           /* No Change */
        exec/exec.h             /* No Change */
        exec/execname.h         /* No Change */
        exec/interrupts.h       /* No Change */
        exec/io.h               /* No Change */
        exec/libraries.h        /* No Change */
        exec/lists.h            /* No Change */
        exec/memory.h           /* No Change */
        exec/nodes.h            /* No Change */
        exec/resident.h         /* No Change */
        exec/tasks.h            /* No Change */

/* exec/alerts.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#define AN_InitAPtr     0x81000007      /* InitStruct() of an APTR source */

/* exec/execbase.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
/****** AttnFlags ******/
/*  Processors and Co-processors: */
#define AFB_68010   0   /* (will remain set for 68020 as well) */
#define AFB_68020   1
#define AFB_68881   4
#define AFB_PAL     8   PAL/NTSC
#define AFB_50HZ    9   Clock Rate


/* exec/ports.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
#define sm_LockMsg      mp_SigTask

/* exec/types.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#define LIBRARY_VERSION 31

/*!!!!!!!! h_graphics !!!!!!!!*/
GRAPHICS INCLUDES
        graphics/collide.h      /* No Change */
        graphics/display.h      /* No Change */
        graphics/gfx.h          /* No Change */
        graphics/graphint.h     /* No Change */
        graphics/rastport.h     /* No Change */
        graphics/regions.h      /* No Change */
        graphics/view.h         /* No Change */

/* graphics/clip.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
        struct  Layer_Info      *LayerInfo;     /* points to head of the list */
        struct  Task    *LayerLocker;   /* points to task that has layerlock */
        struct  ClipRect *SuperSaveClipRects;   /* preallocated cr's */
        struct  ClipRect *cr,*cr2,*crnew;       /* used by dedice */
ADDED:
#ifdef NEWCLIPRECTS_1_1
        LONG    Flags;  /* only exists in layer allocation */
#endif
ADDED:
/* internal cliprect flags */
#define CR_NEEDS_NO_CONCEALED_RASTERS   1

/* graphics/copper.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#ifndef GRAPHICS_COPPER_H
#define GRAPHICS_COPPER_H
OLD:
        short   VWaitPos;   /* vertical beam wait */
        short   DestAddr;   /* destination address of copper move */
CHANGED TO:
        SHORT   VWaitPos;   /* vertical beam wait */
        SHORT   DestAddr;   /* destination address of copper move */
OLD:
        short   HWaitPos;   /* horizontal beam wait position */
        short   DestData;   /* destination immediate data to send */
CHANGED TO:
        SHORT   HWaitPos;   /* horizontal beam wait position */
        SHORT   DestData;   /* destination immediate data to send */
OLD:
    short *start;   /* start of copper list */
    short max;  /* number of long instructions */
CHANGED TO:
    UWORD *start;   /* start of copper list */
    SHORT max;  /* number of long instructions */
OLD:
    SHORT diagstrt[4];  /* copper list for first bitplane */
    SHORT sprstrtup[(2*8*2)+2+(2*2)+2];
    SHORT   sprstop[2];
CHANGED TO:
    UWORD diagstrt[4];  /* copper list for first bitplane */
    UWORD sprstrtup[(2*8*2)+2+(2*2)+2];
    UWORD   sprstop[2];
ADDED:
#endif

/* graphics/gels.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#ifndef GRAPHICS_GELS_H
#define GRAPHICS_GELS_H
#endif

/* graphics/gfxbase.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
    short   Flags;
CHANGED TO:
    USHORT   Flags;
ADDED:
        UWORD   DisplayFlags;   /* NTSC PAL GENLOC etc*/
                                /* Display flags are determined at power on */
ADDED:
#define NTSC    1
#define GENLOC  2
#define PAL     4

/* graphics/gfxmacros.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
#define CINIT(c,n)              { CopperListInit(c,n); }
CHANGED TO:
#define CINIT(c,n)              { UCopperListInit(c,n); }

/* graphics/layers.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#ifndef EXEC_LISTS_H
#include <exec/lists.h>
#endif
ADDED:
/*internal only, not to be made public */
struct LayerInfo_extra
{
        long    env[13];        /* for setjmp/longjmp */
        struct List mem;
        struct List *FreeClipRects;
        short   *blitbuff;
};
/* private defines */
#define LMN_REGION      -1

OLD:
    UBYTE   pad;
CHANGED TO:
    UBYTE   Flags;
OLD:
        UBYTE   bytereserved[2];
        UWORD   wordreserved[2];        /* used to be a node in here someplace */
        ULONG   longreserved[2];
CHANGED TO:
        BYTE    fatten_count;
        UBYTE   bytereserved;
        UWORD   wordreserved;   /* used to be a node in here someplace */
        UWORD   LayerInfo_extra_size;
        ULONG   longreserved;
        struct  LayerInfo_extra *LayerInfo_extra;
ADDED:
#define NEWLAYERINFO_CALLED 1
#define ALERTLAYERSNOMEM 0x83010000

/* graphics/sprite.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
ADDED:
#define SPRITE_ATTACHED 0x80

/* graphics/text.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
#include        "exec/types.h"
CHANGED TO:
#ifndef         EXEC_PORTS_H
ADDED:
#endif
ADDED:
#define FPB_TALLDOT     3       /* designed for hires non-interlaced */
#define FPF_TALLDOT     (1<<3)
#define FPB_WIDEDOT     4       /* designed for lores interlaced */
#define FPF_WIDEDOT     (1<<4)

/*!!!!!!!! h_hardware !!!!!!!!*/
HARDWARE INCLUDES
hardware/adkbits.h              /* No Change */
hardware/blit.h                 /* No Change */
hardware/cia.h                  /* No Change */
hardware/custom.h               /* No Change */
hardware/dmabits.h              /* No Chanintbits.h             /* No Change */

/*!!!!!!!! h_intuition !!!!!!!!*/
INTUITION INCLUDE

/* intuition/intuition.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
    struct ClipRect ReqCRect;
CHANGED TO:
    /* Layer in place of clip rect      */
    struct Layer *ReqLayer;
OLD:
    UBYTE ReqPad1[32];
OLD:
    struct BitMap ReqBMap;
CHANGED TO:
    struct Window *RWindow;     /* added.  points back to Window */
    UBYTE ReqPad2[36]
ADDED:
    /* you can initialize this variable before the gadget is submitted to
     * Intuition, and then examine it later to discover what integer 
     * the user has entered (if the user never plays with the gadget, 
     * the value will be unchanged from your initial setting)
     */
OLD:
/* NOTEZ-BIEN:          0x80000000 is reserved for internal use by IDCMP    */
CHANGED TO:
#define VANILLAKEY              0x00200000  /*  See the Programmer's Guide  */
#define INTUITICKS              0x00400000  /*  See the Programmer's Guide  */
/* NOTEZ-BIEN:                  0x80000000 is reserved for internal use   */
ADDED:
    /** jimm: NEW: 11/18/85: this pointer keeps a duplicate of what 
     * Window.RPort->Layer is _supposed_ to be pointing at
     */
    struct Layer *WLayer;
ADDED:
#define WINDOWTICKED    0x04000000      /* only one timer tick at a time */
ADDED:
/* new printer entries, 3 October 1985 */
#define HP_LASERJET             0x0B
#define HP_LASERJET_PLUS        0x0C

/* intuition/intuitionbase.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
#define INTUITION_INTUITIONBASE_H TRUE
CHANGED TO:
#define INTUITION_INTUITIONBASE_H 1
ADDED:
#ifndef GRAPHICS_VIEW_H
#include        "graphics/view.h"
#endif
ADDED:
/*
 * Be sure to protect yourself against someone modifying these data as
 * you look at them.  This is done by calling:
 *
 * lock = LockIBase(0), which returns a ULONG.  When done call
 * UnlockIBase(lock) where lock is what LockIBase() returned.
 *
 * NOTE: these library functions are simply stubs now, but should be called
 * to be compatible with future releases.
 */
ADDED:
    struct View ViewLord;
    struct Window *ActiveWindow;
    struct Screen *ActiveScreen;
/* the FirstScreen variable points to the frontmost Screen.  Screens are
 * then maintained in a front to back order using Screen.NextScreen
 */
    struct Screen *FirstScreen; /* for linked list of all screens */

/*!!!!!!!! h_lattice !!!!!!!!*/
LATTICE INCLUDES

        lattice/ctype.h         /* No Change */
        lattice/dec.h           /* No Change */
        lattice/dos.h           /* No Change */
        lattice/error.h         /* No Change */
        lattice/fcntl.h         /* No Change */
        lattice/ios1.h          /* No Change */
        lattice/limits.h        /* No Change */
        lattice/math.h          /* No Change */
        lattice/stdio.h         /* No Change */

/*!!!!!!!! h_libraries !!!!!!!!*/
LIBRARIES INCLUDES
        diskfont.h              /* No Change */
        dosextens.h             /* No Change */
        translator.h            /* No Change */

/* libraries/dos.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
#define OFFSET_BEGINING     -1      /* relative to Begining Of File */
CHANGED TO:
#define OFFSET_BEGINNING    -1      /* relative to Begining Of File */
#define OFFSET_BEGINING     OFFSET_BEGINNING  /* ancient compatibility */
OLD:
   BSTR   id_VolumeNode;        /* BCPL pointer to volume name (BCPL string) */
CHANGED TO:
   BPTR   id_VolumeNode;        /* BCPL pointer to volume node */
/* libraries/mathffp.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
FLOAT   abs();                  /* Basic math functions */
CHANGED TO:
int             SPFix();        /* Basic math functions */
FLOAT   SPFlt();
int             SPCmp();
int             SPTst();
FLOAT   SPAbs(),   abs();
FLOAT   SPNeg();
FLOAT   SPAdd();
FLOAT   SPSub();
FLOAT   SPMul();
FLOAT   SPDiv();
OLD:
FLOAT   atan();                         /* Transcendental math functions */
FLOAT   sin(),   cos(),   tan(),   sincos();
FLOAT   sinh(),  cosh(),  tanh();
FLOAT   exp(),   log(),   pow(),   sqrt();
FLOAT   fieee();
CHANGED TO:
FLOAT   SPAsin(),  SPAcos(),  SPAtan(); /* Transcendental math functions */
FLOAT   SPSin(),   SPCos(),   SPTan(),   SPSincos();
FLOAT   SPSinh(),  SPCosh(),  SPTanh();
FLOAT   SPExp(),   SPLog(),   SPLog10(), SPPow();
FLOAT   SPSqrt(),  SPFieee();

/*!!!!!!!! h_resources !!!!!!!!*/
RESOURCES INCLUDES
resources/cia.h                 /* No Change */
resources/disk.h                /* No Change */
resources/misc.h                /* No Change */
resources/potgo.h               /* No Change */

/*!!!!!!!! h_workbench !!!!!!!!*/
WORKBENCH INCLUDES
        icon.h                  /* No Change */
        startup.h               /* No Change */

        workbenchbase.h         /* DELETED */

/* workbench/workbench.h <-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-<-*/
OLD:
enum WBObjectType {
    WBDISK = 1, WBDRAWER, WBTOOL, WBPROJECT, WBGARBAGE, WBDEVICE, WBKICK
};
CHANGED TO:
#define WBDISK          1
#define WBDRAWER        2
#define WBTOOL          3
#define WBPROJECT       4
#define WBGARBAGE       5
#define WBDEVICE        6
#define WBKICK          7
OLD:
    enum WBObjectType   do_Type;
CHANGED TO:
    UBYTE               do_Type;
OLD:
    UWORD               wo_IconDisp:1;  /* icon is currently in a window */
    UWORD               wo_DrawerOpen:1;/* we're a drawer, and it is open */
    UWORD               wo_Selected:1;  /* our icon is selected */
    UWORD               wo_Background:1;/* set if icon is in background */
CHANGED TO:
#ifdef SMARTCOMPILER
    UBYTE               wo_IconDisp:1;  /* icon is currently in a window */
    UBYTE               wo_DrawerOpen:1;/* we're a drawer, and it is open */
    UBYTE               wo_Selected:1;  /* our icon is selected */
    UBYTE               wo_Background:1;/* set if icon is in background */
#else
    /* lattice is not full system V compatible (yet)... */
    UBYTE               wo_Flags;
#endif
OLD:
    enum WBObjectType   wo_Type;        /* what flavor object is this? */
CHANGED TO:
    UBYTE               wo_Type;        /* what flavor object is this? */